Stories @ EKU - conflict resolution