derekovecs: fix mismerge
1 file changed