POST merge fixes