.* s: (Merge conflict in)( .*) . |Ryfs: conflict in: | . kyf [\/\.] d