the whole enchilada
merge conflicts