make_move code added
fixed merge conflicts