postmerge refactoring