Fix of the merge
Remove angular-route, no admin settings part