kontrol: fix merge conflict