refactor to avoid routes conflicts