Conflict Resolve Version Dos

Got rid of the <<<<< HEAD, =====, the replaced information and >>>>>>
origin/test-with-stats.