merge
finish up the app