added some items
fix merges