Fix merged file