router
router conflict resolved