Blog edit view
blog view
Merge conflict