Delta State conflict resolution

Delta State conflict resolution