Added conflictHandler test.
Added 'resolve' conflict handler that (as of now) adds your new argument