Automatic merge failed; fix conflicts and then commit the result.