Trying to fix merger issue