:lipstick: Conflict regex fits windows too
:lipstick: Use non-matching group in CONFLICT_REGEX
Merge pull request #53 from frk1705/fix-lineEndingsWindows

Conflict regex for windows