stuff
removing useless stuff
merge conflicts