Trying to resolve conflict but failed