intial native app commit
resolved some merge conflict