daily merge 20141004