ide: on conflict goto def#907

kodiakhq[bot] merged 1 commit intomastersbdchd/squawk:masterfrom

steved-goto-def-on-conflictsbdchd/squawk:steved-goto-def-on-conflictCopy head branch name to clipboard