Resolve conflict

Author: vitalii-bulyzhyn

sdk/diffgram/file/compound_file.py

@@ -109,12 +109,13 @@ class CompoundFile:
     child_files: List[CompoundChildFile]
     instance_list: List[dict]
 
-    def __init__(self, project: Project, name: str, directory_id: int, instance_list: List[dict] = []):
+    def __init__(self, project: Project, name: str, directory_id: int, instance_list: List[dict] = [], file_type: str = 'compound'):
         self.project = project
         self.name = name
         self.directory_id = directory_id
         self.child_files = []
         self.instance_list = instance_list
+        self.type = file_type
 
     @staticmethod
     def from_dict(project: Project, dir_id: int, dict_data: dict):
@@ -165,7 +166,8 @@ def __create_compound_parent_file(self):
         data = {
             'name': self.name,
             'directory_id': self.directory_id,
-            'instance_list': self.instance_list
+            'instance_list': self.instance_list,
+            'type': self.type
         }
         response = self.project.session.post(url = self.project.host + url,
                                              json = data)