Resolve conflict for merge