Resolving Merge conflicts