new branch b1
AOP started in branch 1
Branch changes release to merge master
Conflicts Resolved
Branch one Changes Done
idea files
Changes merged from branch 1