Unresolved git merge conflict markers resolved. 

I'm not even sure what the difference was, here.