Try commit
Conflict resolved