Added edit and delete features
conflict resolution