merge lastest spark