updated app
solve conflict