changed bala again
Resolved conflicts
Changed bala.txt
Merge conflict resolved