closed #2393:revert some wrong modification when fix conflicts