lil hacky fix for insert conflicts#38

agnescameron wants to merge 2 commits into

mainual-cci/checkout:mainfrom

insert_conflictsual-cci/checkout:insert_conflictsCopy head branch name to clipboard