Alter RoutingResource to avoid any merge conflicts