You pushed a merge conflict...
Just restart the patch from scratch?