fixed merge conflicts

- changed uniqueID back to UUID type
- modified getters & setters for uniqueID to getID which returns UUID
and getStringID which returns String to resolve the merge conflicts