anticipating merge conflicts
merge conflicts
trying to differentiate between continuous and binary