Second merge: Let's try a conflict#1

github-learning-lab[bot] wants to merge 1 commit intomastergudstrand/merge-conflict:masterfrom

update-configgudstrand/merge-conflict:update-configCopy head branch name to clipboard