Fixed another issue with merge