Paste Conflict Text
Paste text with <<<<<<<, =======, >>>>>>> markers, or drag & drop a file.
Conflict 1 of 1
Current (HEAD)
Incoming
Paste text with <<<<<<<, =======, >>>>>>> markers, or drag & drop a file.