resolving memrge conflicts