cleanup merge conficts