finally got the async merge handled