fixing more merge issues