Resolve Merge Conflict