Finished the blog post
Modified the config a bit
Fixed merge conflict