Fix case where path separator is end of match
Fix case where path separator is end of match

Remove debug message
Fixup conflict