New local repo in sample app folder
Fxing conflicts