fdskajfkldsajflksdjaklfjlsdkajfklsdjafkldjsaklfjasdlkjflksa

<<<<<<< HEAD
Test master

Test masetr
=======
<<<<<<< HEAD


Test merge nhe!!!
=======
Test master

Test masetr
>>>>>>> master

child that do nhe!!!!!
>>>>>>> Testmerge

fdskajfkldsajflksdjaklfjlsdkajfklsdjafkldjsaklfjasdlkjflksa

<<<<<<< HEAD
Test master

Test masetr
=======
<<<<<<< HEAD


Test merge nhe!!!
=======
Test master

Test masetr
>>>>>>> master

child that do nhe!!!!!
>>>>>>> Testmerge


change 1
add mot