test merge at 1/8/13