Created first parts of conflict resolution including map of actors