changes while trying to get MERGE to work