2 modify
1 modify
complete conflict
master modify
br modify
It's no conflict now