app controller and index html
fixed merged issues