added class 1
fixed conflict