Prepare for merge