modify for merge
modify for merge