added two content types
added zpt
merge