fixed merge file