merged changes, added am hist HW