fix a few merge problems