Prepare for Git merging