changes ebefore conflict
bug fixed
fix.txt is edited
bug fix