<<<<<<< HEAD ¯\_(ツ)_/¯

text

======= ¯\_(ツ)_/¯

text

>>>>>>>>>>>>>(git commit id here)