Fixed merge conficts?