Fix merge conficts