fixed css class name & updated version
fixed conflicts