<<<<<<< foo.mine This is no test. ======= This is a simple test. >>>>>>> foo.r2