archive and delete
merge resolved