fixed merge conflict

1 job for master in 9 minutes and 34 seconds (queued for 1 second)
Status Job ID Name Coverage
  Pack
failed #159419
pack

00:09:34

 
Name Stage Failure
failed
pack Pack
[ERROR] -> [Help 1]
[ERROR]
[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
The command '/bin/sh -c cd /opt/workload-api ; mvn clean install' returned a non-zero code: 1
ERROR: Job failed: exit code 1