fixed conflict

Signed-off-by: Jimmy Fjallid <jfjallid@gmail.com>