Mid DevOps Git will highlight the conflicts in files like this:? <<<<<<< HEAD old code ======= new code >>>>>>> feature/login