after-merge fixes