Fixed some messed up merge