Commit from second user
Resolve conflict