improved route handling
fix merge conflict