fix some merge failures