merge errors fixed, app compiles/runs