making sure merge conflicts are resolved