Fixed file merging errors.
Removed merging backups.