fix emphasis
fix conflict