merging goods and cart_final
little changes before freat job
again