first config jekyll
fix conflicts