modify lhx
conflic fixed