Multialign annotate
fix conflict