udpate for 2013
fix merge conflict