it works again
merged, and working