Fix weird double-merge error