Fixed some bad merge items.