Fix minor merge error