merging changesets refactorings