fix merging conflict

clever.wdl

@@ -53,9 +53,6 @@ task Mateclever {
         outputPath: {description: "The location the output VCF file should be written.", category: "common"}
         threads: {description: "The the number of threads required to run a program", category: "advanced"}
         memory: {description: "The memory required to run the programs", category: "advanced"}
-        cleverMaxDelLength: {description: "Maximum deletion length to look for from clever predictions.", category: "advanced"}
-        maxLengthDiff: {description: "Maximum length difference between split-read and read-pair deletion to be considered identical ", category: "advanced"}
-        maxOffset: {description: "Maximum center distance between split-read and read-pair deletion to be considered identical", category: "advanced"}
         dockerImage: {description: "The docker image used for this task. Changing this may result in errors which the developers may choose not to address.", category: "advanced"}
     }
 }
@@ -96,7 +93,6 @@ task Prediction {
     }
 
     parameter_meta {
-<<<<<<< HEAD
         fiteredBam: {description: "The bam file where sequences less than 30bp were removed.", category: "advanced"}
         indexedFiteredBam: {description: "The index of the filtered bam file.", category: "advanced"}
         bwaIndex: {description: "The BWA index files.", category: "required"}
@@ -107,15 +103,6 @@ task Prediction {
         maxLengthDiff: {description: "Maximum length difference between split-read and read-pair deletion to be considered identical ", category: "advanced"}
         cleverMaxDelLength: {description: "Maximum deletion length to look for from clever predictions.", category: "advanced"}
         memory: {description: "The memory required to run the programs", category: "advanced"}
-=======
-        # inputs
-        bamFile: {description: "The bam file to process.", category: "required"}
-        bamIndex: {description: "The index bam file.", category: "required"}
-        bwaIndex: {description: "The BWA index files.", category: "required"}
-        outputPath: {description: "The location the output VCF file should be written.", category: "common"}
-        threads: {description: "The the number of threads required to run a program", category: "common"}
-        memory: {description: "The memory required to run the programs", category: "common"}
->>>>>>> 338f85339b62da7921f2d5d68d0870e81a80d542
         dockerImage: {description: "The docker image used for this task. Changing this may result in errors which the developers may choose not to address.", category: "advanced"}
     }
 }