adjusting for merge