Fix for merge conflict on routes
Fix for merge conflict on routes

merid14/snipe-it,merid14/snipe-it,MicaelRodrigues/snipe-it,thehereward/snipe-it,MicaelRodrigues/snipe-it,thehereward/snipe-it,thehereward/snipe-it,ddreier/snipe-it,merid14/snipe-it,ddreier/snipe-it,ddreier/snipe-it,MicaelRodrigues/snipe-it