Move diffconflicts to bin dir