Tom's conflict resolution