got it working
merge