fixed errant merge conflicts