add rail fcn
fix merge conflict