web app structure
merge conflict solved