Local edit
Resolve conflict