Git will stop and mark conflicts in the affected files like this:?

<<<<<<< HEAD

current branch code

=======

incoming branch code

>>>>>>> feature/contact-form