fixed conflict - choose the second change