My bad, there's 1 more conflict. Resolved now