made it work
merge