Fix merge precedence to override user-specified attributes