Comment and fix merge conflicts in routers