fixing some of the items merged