change-merge fixes