removed merge file