package.json merge conflict resolved
,
starting the test suite
passes config.env