fix: allow non-conflict edit#20

chojs23 wants to merge 3 commits intomainchojs23/ec:mainfrom

editor-reloadchojs23/ec:editor-reloadCopy head branch name to clipboard