fix change conflict error message
4.4.2