Version conflict resolution

The Web App will resolve version conflicts when two or more users are editing different fields on the same entry. The updates will be merged and appear in the user's instance of the Web App when they modify content on the entry.

However, if users are editing the same field, they will receive an in-app notification that will alert them that the entry they are currently editing is out of date due to an another user making changes to that entry.

As a part of this work, the "discard" changes functionality has been removed.