Removed merge from schema file
Added merge to lazy/merge
Added a file to test the new classes