fix some merging failures