initial
fix gitignore conflicts