Conflict Resolution Plugin v1.2.1

• Fixed bug where plugin didn't work with offficial released version of Joplin.

NOTE: The dynamic resizing feature of the UI will NOT work for the time being until Joplin releases an update from its side.