merge fixes 3