merge fixes part 2