Bug description

When in edit mode on the web view, if you make a comment and then merge your changes, the comment is deleted. This occurs regardless of whether or not the line you commented on was changed.

How to reproduce

1. Navigate to the web view for a page.
2. Enter edit mode.
3. Add a comment to any line of the page.
4. Merge.
5. The comment is gone.

Additional context

This may be a bug or it may be a feature gap, it's unclear what the intended behavior is but it seems like a bug since the user is allowed to create comments while in edit mode, but none of those comments ever survive the merge.

It would be cool if comments made while in edit mode were retained after merging, to allow a user to seamlessly edit and comment on a document without having to go between modes.

While it'd be less preferable, if the desired behavior is for comments to not be retained after merging, then the ability to add comments should be removed while in edit mode, since they never actually make it onto the page (it just confuses the user into thinking they can add comments while in edit mode).