fixing stuff from conflict

Signed-off-by: Ondrej Rafaj <ondrej.rafaj@fuerteint.com>