merge conflict
fixed conflict-chose the addition