solved a merge conflict