merge conficts resolved