update for merges