fixing my errant merge breakage