Rebuild container fix

Author: arnaldoperez

.devcontainer/devcontainer.json

@@ -22,11 +22,7 @@
 			"extensions": ["learn-pack.learnpack-vscode"]
 		}
 	},
-<<<<<<< master
-	"onCreateCommand": "pip3 install pytest==6.2.5 mock pytest-testdox toml && npm i @learnpack/learnpack@2.1.50 -g && learnpack plugins:install @learnpack/python@1.0.3"
-=======
 	"onCreateCommand": "pip3 install pytest==6.2.5 mock pytest-testdox toml && npm i @learnpack/learnpack@2.1.56 -g && learnpack plugins:install @learnpack/python@1.0.3"
->>>>>>> master
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},