Update conflict marker formatting test.  We now no longer format the second branch of hte merge.