hr
merge fix