Merging over sammich get, and infras manual change