merge & remove local