after merge br2 with br2-1
diff branch test
curious situation
after merge conflict resolving