Undo merge.
Added code comments.