fixed hp issue
merge