Added another line on A.
Fixed conflicts in file.txt