Modifying a.txt
Fixing conflicts