Look at the repo. Now back to me. Now look at the repo. Now back to me. THE SITE IS NOW JEKYLL
Resolve merge conflicts