Fixed duplicate methods and fields from automatic merging in the Requirement class