handle empty cell during conflict; bump version