fix conflict routes