Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master' of github.com:StructuralVariants/manta
Merge branch 'master' of github.com:StructuralVariants/manta
Merge remote-tracking branch 'origin/master'
fix cluster merge error