trying to resolve the merge conflict