Setting up for merge between branches