Fix merge conflicts
Fix merge conflicts

mathmatrix828/BWWalkthrough,ariok/BWWalkthrough,wircho/BWWalkthrough,ernestopino/BWWalkthrough,mekentosj/BWWalkthrough,XBeg9/BWWalkthrough,mathmatrix828/BWWalkthrough,ariok/BWWalkthrough,skeeet/BWWalkthrough,dimala/BWWalkthrough,mathmatrix828/BWWalkthrough,lexieernst/UI-internathon,lexieernst/UI-backend-internathon,swipesight/BWWalkthrough,swipesight/BWWalkthrough,machelix/BWWalkthrough