fixed routes deleted by merge conflict

@zoheiry