resolve merge conflict with local changes (HEAD).

2 jobs for v0.6-release in 46 seconds (queued for 31 minutes and 22 seconds)
latest
Status Name Job ID Coverage
  Test
failed unit_tests_with_coverage #357262

00:00:46

 
  Deploy
skipped run_scenario_files #357263
 
Name Stage Failure
failed
unit_tests_with_coverage Test
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :simulator
ERROR: Job failed: exit status 1