fixed any pull related errors

might of also fixed the death with hp
fixed shield model/game asset