patch up after merge