My ci resolve conflicts