Fix merge confict in Route.php

This is a fix for the merge conflict. This is now correct right?