Coverity issues: Fixed conflicts

Signed-off-by: Daan Hoogland <daan@onecht.net>