Fix equals method and test class
merge conflict resolution