add .gitignore
start on main app
fix merge conflict