adjust for merge