[FIX] Fixed a bug the was created when merging files.