layout for posts changed
merge conflict