Mark: golden tools for resolving conflicts in a couple