fixed conflicting routes