Merge mach-msm with stock