Remove extra merge file