Fix weird git stuff

When there's a path conflict and you have to merge, git adds weird
stuff into the file if you don't handle the rebase and merge correctly
which is what I did not do.

Change-Id: Ic073478b6f7a36f42047ff0e1ba11b13bf88901c