Added blog folder
test
-o
-o
-o
deleted conflict code