routes conflict fix