@hackage resolve-trivial-conflicts0.2

Remove trivial conflict markers in a git repository