base structure for new app
merged conflict