resolved conflicts in terms that i didn't catch earlier