drbd: fix up merge error