removes a merge conflict missed in the previous commit.