fix a couple merge errors