Allow smarter conflict resolution

Currently conflict resolution is implemented by comparing two event lists (uncommited vs. unseen) and only allows answering with "solved" or "not solved". It should be possible to allow re-executing commands to solve the conflict. This woul require changing the interface because a new instance of the aggregate would be returned in this case.
