So this happened just now with a colleague. He’s been working for few months now.
My way of handling merge conflict:
Open WinMerge to diff See the conflicting part Correct the conflicting part by copying the changes to the destination file in WinMerge His way
Open WinMerge to diff See the conflicting part Opens the source file in Windows notepad Copies the entire contents to clipboard Opens a new tab in Notepad++ Pastes the contents