today modified 2014.12.15
today update 2014.12.15
conflict fixed