rename rm -> trash
merge