add date and price
resolved conflict novalidate