Resolves Merge Conflict