recommitting the router code after the merge conflict