init
very basic app
merge