br3 commit 1
resolved merge conflict
br3 complete
Merge branch 'br3'