solved the merge conflict