Local 10
Resolve Conflict