merge fixes 2