Commits starter files for the app
Resolves conflict