trying to get the merge to work