Finally got it working again
fixed that
did tha merge