Conflict resolution failed on renaming field together with its accessors #70
added equal/hashcode implementations