Welcome! Let's resolve a conflict#1

github-learning-lab[bot] wants to merge 2 commits into

masterschtefan/merge-conflicts:masterfrom

update-configschtefan/merge-conflicts:update-configCopy head branch name to clipboard