FIX: Resolve conflicts