string1
<<<<<<< HEAD
string2
string3
=======
string2string4
>>>>>>> origin/master