Resolve conflict merge fail