Undo button working.
Overwrote conflicts.