Going to see if we can't make better use of Jekyll
Fix merge conflict