sharing and unsharing finished, delete in progress
resolving merge conflicts