add 6
fix conflict