board working on exercise show
merge conflict