first commit through second user
Merge conflict Resolved