Fix: Rebase issues

.gitignore

@@ -35,4 +35,4 @@ standards_cache.sqlite
 
 ### Neo4j
 neo4j/
-.neo4j/
+.neo4j/

CONTRIBUTING.md

@@ -103,4 +103,4 @@ We use eslint and black to enforce style. `make lint` should fix most style prob
 * Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
 * Limit the first line to 72 characters or less
 * Reference issues and pull requests liberally after the first line
-* When only changing documentation, include `[ci skip]` in the commit title.
+* When only changing documentation, include `[ci skip]` in the commit title.

Makefile

@@ -35,7 +35,8 @@ e2e:
 test:
 	[ -d "./venv" ] && . ./venv/bin/activate
 	export FLASK_APP=$(CURDIR)/cre.py
-	flask routes && flask test
+	flask routes
+	flask test
 
 cover:
 	. ./venv/bin/activate && FLASK_APP=cre.py FLASK_CONFIG=testing flask test --cover

application/cmd/cre_main.py

@@ -14,19 +14,18 @@
 from application.defs import osib_defs as odefs
 from application.utils import spreadsheet as sheet_utils
 from application.utils import spreadsheet_parsers
-
-# from application.utils.external_project_parsers import (
-#     capec_parser,
-#     cwe,
-#     ccmv4,
-#     cheatsheets_parser,
-#     misc_tools_parser,
-#     zap_alerts_parser,
-#     iso27001,
-#     secure_headers,
-#     pci_dss,
-#     juiceshop,
-# )
+from application.utils.external_project_parsers import (
+    capec_parser,
+    cwe,
+    ccmv4,
+    cheatsheets_parser,
+    misc_tools_parser,
+    zap_alerts_parser,
+    iso27001,
+    secure_headers,
+    pci_dss,
+    juiceshop,
+)
 from application.prompt_client import prompt_client as prompt_client
 from dacite import from_dict
 from dacite.config import Config