br2 modify
master modify
It's no conflict now