Joan's Changes
RESOLVE CONFLICTS