Second conflict (Git)
=Resolved conflict
Resolved conflict