Conflict Resolution and Self-Awareness