Fixing merge method on the manager
Adding test for the manager .. WIP