MERGE CONFLICTS RESOLVED