Editing.
Resolving merge conflict.