You should now be able to move. Oddly enough, you can't.
Merge conflict solved.