Fixed cosmetic relative path shown by conflicter

Fix cosmetic issue bringed up in #378.