init
fix .gitignore conflicts