edit for merge