more fixing of merge conflicts