creating a merge conflict  -- hopefully