Forgot a merge conflict