Resolve conflict correctly