Fixed merge error

Signed-off-by: Andreas Pohl <apohl79@gmail.com>