before
<<<<<<< HEAD
local_value = 1
=======
remote_value = 2
>>>>>>> branch
after
