fixed some messed up merge