update for new merge strategy