FIX::resolve conflicts