MERGE CONFLICT RESOLUTION