Preserve canonical base label when importing merge-style conflicts#28

chojs23 merged 1 commit intomainchojs23/ec:mainfrom

fix/merge-style-conflictchojs23/ec:fix/merge-style-conflictCopy head branch name to clipboard