Preparing to merge branches