Release v2.48.0: Cloud conflict decisions save one note and stay saved, queued conflicts merge when they can, interrupted uploads clean up, Escape keeps Quick Capture open

Release v2.48.0: Cloud conflict decisions save one note and stay saved, queued conflicts merge when they can, interrupted uploads clean up, Escape keeps Quick Capture open #791