SOLVE MERGE CONFLICTS