Fix cell merging, #179