fix pads
merge