Fixing merged files.