@hackage resolve-trivial-conflicts0.3.2.4

Remove trivial conflict markers in a git repository

Remove trivial conflict markers in a git repository