fixing combining cells bugs