SOLVE CONFLICTS