vehiclemove
fixed conflicts