fix SNAFUs from careless merges