place other items in gitignore
fix merge conflict with latest master