a jekyll test
fixing conflict in .gitignore