basic 2 views app
merge