Update Dispatcher.php

PHPdocs fix
fix conflicts.