merge conflicts in router