fixing merge conficts