Removed old merge file