Fix the messed up merge