make app changes
merge files