merge local
merge
delete useless file