Refactored code order after merge conflict resolution.