Add line2 for br1
Add line2 for dev
Resolved conflict