works now
merge