Resolve conflict after merge