fix merge conflict
fix merge conflict
new blog entry