removed old merge file