Git Merge Ours Theirs Nothing Holding