move stuff
add harsh merge