some deletes
merge changes