merge from my blog