Fix merge conflict

Signed-off-by: Paul de Wouters <paul@hmn.md>