Preparing to merge again