Setting up for a Merge between branches