further merge fixes