attempting to resolve conflict early-on (will know later if this was the
"right" way to resolve this.)