fixed routes deleted by merge conflict
Merge pull request #338 from MGhanem/fix_master

fixed routes deleted by merge conflict