add 2
fix merge conflict