testing a merge