better support for conflict resolution - display both version next to each other

### How to use GitHub

* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you want to have the same feature implemented.
* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
* Subscribe to receive notifications on status change and new comments.

### Feature description
To decide which version is the correct one, it is usually necessary to make a visual comparison, the date alone is often not sufficient
- Button which opens both versions with distinctive window titles "local" and "server"
- Button "Keep both" - instead of clicking local und server separately

After solving one conflict the program should jump to the next one