fix 1 conv
conv fix 2