remove --resolve-conflicts

[Kelly Selden]

I don't think anyone uses it, and the logic is complicated.

[Alon Bukai]

I was using it :) @kellyselden
Also, the PR #1022 shows a deprecation method during usage but the README still recommends using it :)