Resolving conflicts.
Resolving conflicts.
Edits suggested by @lamblin.