Fix merge-related compile errors. see #13