fix merge in assembly [ci skip]