Refactoring and automatic conflict resolution