Systems for web-based collaboration systems. Two or more users can operate concurrently on objects stored in a cloud-based environment that hosts shared objects. Concurrent editing is facilitated by components in the cloud-based environment that serve to grant a first user, a first permission to modify a first instance of an object to be edited with a first editing tool, then grant to a second user, a second permission to modify a second instance of the same object to be edited with a second editing tool instance. The occurrence of a modification event that presents a conflict is detected, and steps are taken for determining a range of possible remediation tool options that can be used to address the modification conflict. Remediation tool options include remediation tool options that are natively supported within the editing tools. A set of applicable remediation tool options are presented in a user interface.