fixed conflicts around gitignore