Conflict handler
Clean up previous commit

action_container -
   clean up _checkConflict
   handleConflictResolve - reword to fit this code style
      tweak names to clarify distinction between the new action
      and the one it is in conflict with
base.js - remove the 'resolve' test; better version in conflict.js
conflict.js - implement assert tests on the help
  add a test for multiple conflicts
  (I could also add a 'resolve' version of the multiple conflicts)