FIX CONFLICTS