Only modified bar.txt
Modified README.md and conflict.txt