Local change
Conflict solved