fixing stupidities :)
merge