Fixed messed up merge