Added local Jekyll support
Fixed Merge conflict