fix app naming issue
remove merge conflicts