Symbol: CONFLICT_RESOLVED