fix a few merge errors