add clash.
Resolve merge conflicts on Windows too.