sammy routing done
fix merge conflict