fix other merge conflicts