What did I do?
what
Ended up in git merge hell