fix several incorrect merges.