add new functional
fix conflict

merge strings in file fileSecondBr.txt