Ensure relatives path when resolving conflicts

A cosmetic issue bringed up in #378.

I'm just unsure this is the correct behavior, and I'm unsure there's any correct behavior aside absolute paths.

Should it really be based on the current working directory? (this one can be changed by Node.js, but it feels like the closest to want we want)