For conflicts where the filepath is '.', print the directory instead of just dot

What do you guys think about this?