Resolved merge conflict in getClassification()