2014 07 21  merge