background added
merge conflict mended
categories page