added stuff in stuff
fixed merge conflict