bug fixing no js do  creditCard
merge