Fixing badly merged file.