fix some conflicts that for some reason weren't resolved during the last cherry-picks