Solving error in merge resolve