Merge app changes from local branch