fix small error in contig generation
fix conflicts