update mr script
fix merge conflict