Merge branch 'js/ort-clean-up-after-failed-merge'