fix some conflicts leftovers in basic_function.f90