updating app
merging files