set up app
finish merge