stuff
merge conflict
fixed two tests
fixed broken tests