added support for saving with new methods
merge + added support for adding classes to xml, plus checking duplicates. However it needs ot be debugged
merge conflict resolution