Route file conflicts with route file from parent project
Merge pull request #4 from akkie/master

Route file conflicts with route file from parent project