Mainly smashedpotatoe merges