What's going on here? You have committed while you had a merge conflict in this file...