after merge - rename etc...