change to proba.txt file
merge conflict resolved