0.16alpha.12: use hit-count optimization in paired-end aligner
Fix merge conflicts