my Jekyll blog
fix conflict