To undo a merge you must click undo twice

[ryanmcweeny]

When resolving issues in the conflation tool I have found that if you mistakenly merge two features it requires two uses of undo to unmerge and undelete the point. If you do not do it twice and attempt to go to the next error or previous you get the error message in the image below. If this process can not be fixed maybe the error message could be more clear what is happening?