Fixed merge conflict
Fixed merge conflict

dalrayes/writespeakcode.github.io,rachelober/writespeakcode.github.io,dalrayes/writespeakcode.github.io,dalrayes/writespeakcode.github.io,rachelober/writespeakcode.github.io,rachelober/writespeakcode.github.io