error fixes in app
merge:)