Refactoring and renaming - preemptive conflict merge