On branch b1
New commit on b1
Resolved conflict