fixed resolution issue

configure.ac

@@ -8,7 +8,7 @@ dnl Process this file with GNU autoconf(1) to produce a configure script.
 dnl
 
 dnl autoconf v2.69 was released in 2012-04-24
-AC_PREREQ([2.69])
+AC_PREREQ([2.71])
 AC_INIT([e3sm_io],[1.3.0],[],[e3sm_io],[])
 
 AM_EXTRA_RECURSIVE_TARGETS([tests])
@@ -217,7 +217,15 @@ dnl AC_PROG_RANLIB
 LT_INIT
 
 AC_HEADER_STAT
-AC_HEADER_STDC
+m4_warn([obsolete],
+[The preprocessor macro `STDC_HEADERS' is obsolete.
+ Except in unusual embedded environments, you can safely include all
+ ISO C90 headers unconditionally.])dnl
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change. They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+
 AC_CHECK_HEADERS([fts.h])
 if test "x$ac_cv_header_fts_h" != xyes ; then
  # Force to use MPICXX to check C++ header

src/cases/var_wr_case.cpp

@@ -420,19 +420,14 @@ int e3sm_io_case::var_wr_case(e3sm_io_config &cfg,
  }
  }
  }
-<<<<<<< HEAD
 #ifdef ENABLE_CACHE_VOL
  hid_t fd;
  if (cfg.api == hdf5) {
  driver.inq_file_id(ncid, &fd);
  H5Fcache_async_op_pause(fd);
  }
 #endif
- /* write all climate variables */
-=======
-
  /* write all climate record variables */
->>>>>>> 037cb7ab18c152f01417ad6711052d742075de72
  for (j=num_decomp_vars; j<nvars; j++) {
 
  if (!vars[j].isRecVar) continue;