Merge support for conflicts

🧭 The new conflict system

• Fix the "File Exists with the same name" issue within Mudstack! You can now resolve this issue in two different ways!
• Rename the local file so they have unique names
• Merge the version trees so both files versions stay together

NOTE - We are still migrating the old system (same id conflicts) over to the new system, so you'll see 2 different type of conflict resolution paths for nowWhat else is new?

• Sorting by name in the unstaged and staged changes view will now sort by path+name rather than just name
• ctrl/cmd + q will quit the application. Using File -> Quit Mudstack will always quit the application regardless of close to tray settings
• When mapping a workspace, it will show the full path including the created workspace folder vs. the parent directory only

Bug fixes

• Cloud only files won't show Show in explorer option
• Two spinners were showing on the in progress changes view