You will get conflict when you try to merge it. You don't need to add this file to your pr, we already have routes declared.