add ItemRender
Fix merging problems