continuing fixing merge issues