fix merge conflict resolution