continued merge