removed conflict
directive for hierarchy added