post merge fixes