pushing stuff
fixed merge conflict