removed all branch changes from previous merge