Fix weird merge error