diff --git a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
index 3b958dbd..591b9da3 100644
--- a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
+++ b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
@@ -387,7 +387,11 @@ protected OptionsBuilder createOptionsBuilder(AsciidoctorMojo configuration, Att
         final OptionsBuilder optionsBuilder = Options.builder()
                 .backend(configuration.getBackend())
                 .safe(SafeMode.UNSAFE)
+<<<<<<< HEAD
                 .standalone(configuration.standalone)
+=======
+                .standalone(configuration.isHeaderFooter())
+>>>>>>> 63b2278 (Fix standalone option)
                 .mkDirs(true);
 
         if (!isBlank(configuration.getEruby()))