Fix Branches being visible on org/branch component view
Cleanups
bugfix
Cleanups.
Move the record merger to the module that says it contains it