updating move function
fixed conflicts