merge file fixed