merge from hp to my git