/testGit

testGit =

dsf zzz conflict <<<<<<< HEAD dsf lah lah lah zzz HAHA bobo conflictzzzzzzz dsf

dsf dsfa dsasfdsaf fads dsadsfas zzz HAHA conflict dsf GOOOD GOOODOGOO

21761c2f05db443d3e01af7b5c6a6469073802e8 zzzDOODLEDUDDD conflictDUE newLIneFromLocal dsaf dsa NONONO YES! NO!f dsa nananan f dsa asdfa sdf asdf asdf dsafdsaf sadf