Remove merge conflicts I forgot to fix.
Remove merge conflicts I forgot to fix.

ZDroid/jekyll,noikiy/jekyll,rlugojr/jekyll,jeffkole/jekyll,Strangehill/jekyll,tomjohnson1492/jekyll,gencer/jekyll,nasht00/jekyll,derekgottlieb/jekyll,alex-kovac/jekyll,getandpost/jekyll.github.io,derekgottlieb/jekyll,xcatliu/jekyllcn,ZDroid/jekyll,darwin/jekyll,ZDroid/jekyll,chrisfinazzo/jekyll,chrisfinazzo/jekyll,alfredxing/jekyll,stomar/jekyll,xiebinhqy/jklly_china,noikiy/jekyll,tomjohnson1492/jekyll,gencer/jekyll,ryanshaw/jekyll,jekyll/jekyll,floydpraveen/jekyll,xcatliu/jekyllcn,tomjohnson1492/jekyll,chrisfinazzo/jekyll,alex-kovac/jekyll,alex-kovac/jekyll,x-way/jekyll,nasht00/jekyll,jeffkole/jekyll,stomar/jekyll,floydpraveen/jekyll,gencer/jekyll,jaybe-jekyll/jekyll,darwin/jekyll,Strangehill/jekyll,pmarsceill/jekyll,xiebinhqy/jklly_china,ryanshaw/jekyll,x-way/jekyll,jaybe-jekyll/jekyll,rasa2011/rasa2011.github.io,fulldecent/jekyll,ryanshaw/jekyll,darwin/jekyll,xcatliu/jekyllcn,rasa2011/rasa2011.github.io,pmarsceill/jekyll,Strangehill/jekyll,x-way/jekyll,stomar/jekyll,floydpraveen/jekyll,x-way/jekyll,rlugojr/jekyll,noikiy/jekyll,darwin/jekyll,jekyll/jekyll,pmarsceill/jekyll,tomjohnson1492/jekyll,Strangehill/jekyll,alex-kovac/jekyll,nasht00/jekyll,noikiy/jekyll,tillgrallert/jekyll,xcatliu/jekyllcn,rlugojr/jekyll,fulldecent/jekyll,xiebinhqy/jklly_china,jeffkole/jekyll,chrisfinazzo/jekyll,fulldecent/jekyll,ryanshaw/jekyll,tillgrallert/jekyll,derekgottlieb/jekyll,rasa2011/rasa2011.github.io,Strangehill/jekyll,gencer/jekyll,jekyll/jekyll,tillgrallert/jekyll,tillgrallert/jekyll,alfredxing/jekyll,alfredxing/jekyll,getandpost/jekyll.github.io,tomjohnson1492/jekyll,derekgottlieb/jekyll,stomar/jekyll,floydpraveen/jekyll,yhironaka/yhironaka.github.io,pmarsceill/jekyll,jaybe-jekyll/jekyll,jaybe-jekyll/jekyll,getandpost/jekyll.github.io,rlugojr/jekyll,jekyll/jekyll,jeffkole/jekyll,gencer/jekyll,fulldecent/jekyll,alex-kovac/jekyll,tillgrallert/jekyll,nasht00/jekyll,xiebinhqy/jklly_china,alfredxing/jekyll