fix merge conflict (using theirs)