fix merge conflicts

lib/gitlab/import_export.rb

@@ -6,10 +6,6 @@ module Gitlab
       File.join(storage_path, relative_path)
     end
 
-    def project_attributes
-      %i(name path description issues_enabled wall_enabled merge_requests_enabled wiki_enabled snippets_enabled visibility_level archived)
-    end
-
     def project_tree_list
       project_tree.map {|r| r.is_a?(Hash) ? r.keys.first : r }
     end

lib/gitlab/import_export/attributes_finder.rb

 module Gitlab
   module ImportExport
     class AttributesFinder
+    
       def initialize(included_attributes:, excluded_attributes:)
         @included_attributes = included_attributes || {}
         @excluded_attributes = excluded_attributes || {}

lib/gitlab/import_export/import_export.yml

@@ -22,7 +22,6 @@ included_attributes:
     - :path
     - :description
     - :issues_enabled
-    - :wall_enabled
     - :merge_requests_enabled
     - :wiki_enabled
     - :snippets_enabled

lib/gitlab/import_export/import_export_reader.rb

@@ -17,11 +17,11 @@ module Gitlab
       private
 
       def build_hash(model_list)
-        model_list.map do |model_object_hash|
-          if model_object_hash.is_a?(Hash)
-            build_json_config_hash(model_object_hash)
+        model_list.map do |model_objects|
+          if model_objects.is_a?(Hash)
+            build_json_config_hash(model_objects)
           else
-            @attributes_parser.find(model_object_hash)
+            @attributes_parser.find(model_objects)
           end
         end
       end