fix conflict and merge

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

module1_2/inputData/project-buxus-tree2/Genomes.txt

...a/project-buxus-tree2/karyotype/karyotype_19990_Vitis.txt

...oject-buxus-tree2/karyotype/karyotype_28620_Aquilegea.txt

...project-buxus-tree2/karyotype/karyotype_35405_Nelumbo.txt

...ject-buxus-tree2/karyotype/karyotype_54057_Amaranthus.txt

...ct-buxus-tree2/karyotype/karyotype_57266_Tetracentron.txt

...a/project-buxus-tree2/karyotype/karyotype_57268_Buxus.txt

module1_2/inputData/project-buxus-tree2/phyloTree.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt

...filtered.dag.all.go_D20_g10_A5.aligncoords.gcoords.ks.txt