forca game almost done
conflict fixed