fix routes conflicts
fix conflcit