Corrected Jekyll build errors.
Resolved conflict.