Local commit
Conflict solved