Resolve conflicts with modern gems