fixed a few merge issues