resolving more merge conficts