Merged changes from multiple sources and deleted aux files.