Stop the merge/rebase process.?

Follow:

Mark the conflicting sections in your file:

<<<<<<< HEAD

your current branch code

=======

incoming branch code

>>>>>>> feature/new-ui