fix merger conflict

Signed-off-by: Armin Kuster <akuster@mvista.com>