updating the merge script from the 2014-02-03 merge day