syntax error

[Mark Johnson]

Hi,
I am trying to build svn rev.  14357.  I got a syntax error:
druid-qif-import.c: In function `gnc_ui_qif_import_select_file_cb':
druid-qif-import.c:359: error: syntax error before '<<' token

Anybody else seen this?  The section of code looks like this:
...
  if (default_dir == NULL)
    gnc_init_default_directory(&default_dir);
<<<<<<< .mine
  new_file_name = gnc_file_dialog (_("Select QIF File"), "*.[Qq][Ii][Ff]",
                  default_dir, GNC_FILE_DIALOG_IMPORT);
=======
 >>>>>>> .r14357

  filter = gtk_file_filter_new ();
...

I am using gcc version 3.3.6.

Mark