add app 1
Merge origin/master