Prepare for merging