manually fixed conflict