Updated .gitignore

Fix for script/ci
fixes merge conflict