Trying to set up a merge