still fixing my messed up merge