more renaming
merge move
merge
delete from bad merge
finish rename