fixes
mergeed routes