Merge code from previous app