re-implemented what i did before :(
merge failures