computer turn stuffz
fixed conflicts