How To Manually Resolve Merge Conflicts