fixing a few merge issues