fixing my booboo (merge issue) but not really