Fix conficts