Fixed merge conficts