Trying to get merge to work