test conflict
merge to fix conflicts in gitignore