SCRUM#615: fixed merge conflicts

Signed-off-by: Rafael S Castilho <rsc15@inf.ufpr.br>
4 jobs for linitan_build in 3 minutes and 42 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Lint
passed #29990
debian-packaging
lint_python

00:00:31

passed #29989
debian-packaging
lint_shell

00:00:13

 
  Build
passed #29991
debian-packaging
build

00:00:24

 
  Test
passed #29992
ubuntu regular
test

00:02:46