hourly merge 2014-8-17 13:24:47