Note that the git conflict markers have nothing to do with Github but are generated by git itself (the commmand line client running locally on your machine).
I would love to know, how your captive portal is getting a valid certificate for https://google.com.
The problem is: If the first connection of the client is a https connection, your captive portal has no possibility to redirect this request to the portal.