minor refactoring
conflict resolution