update for merge