some stuff
merge conflict hopefully solved.