prepare for merge