Conflict Merging
ENH: Added Cell
Merge branch 'cell'