diff --git a/src/hedit.c b/src/hedit.c
index 62b7bc7..55e0479 100644
--- a/src/hedit.c
+++ b/src/hedit.c
@@ -64,7 +64,7 @@ ACMD(do_oasis_hedit)
 
   d = ch->desc;
 
-  if (!str_cmp("save", argument)) {
+  if (!str_cmp("save", arg)) {
     mudlog(CMP, MAX(LVL_BUILDER, GET_INVIS_LEV(ch)), TRUE, "OLC: %s saves help files.",
            GET_NAME(ch));
     hedit_save_to_disk(d);
diff --git a/src/interpreter.c b/src/interpreter.c
index fd9460d..a8fc64f 100644
--- a/src/interpreter.c
+++ b/src/interpreter.c
@@ -699,7 +699,11 @@ static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alia
 	write_point += strlen(tokens[num]);
       } else if (*temp == ALIAS_GLOB_CHAR) {
         skip_spaces(&orig);
+<<<<<<< HEAD
 	strcpy(write_point, orig);		/* strcpy: OK */
+=======
+        strcpy(write_point, orig);		/* strcpy: OK */
+>>>>>>> f81cf2451717859aecaebb3ca07daf7b9d9a45a5
 	write_point += strlen(orig);
       } else if ((*(write_point++) = *temp) == '$')	/* redouble $ for act safety */
 	*(write_point++) = '$';