Local edit.
Resolved conflict.