jekyll
conflict resolution