Resolved merge conflict in aaa_file

Dude, this was easy!