initial commit blog
merged conflict.