Solving merging issues
Created the Base class