Better handling of directory conflict

We won't present a diff option anymore.

Fix #426