fixes for messed up merge