resolved conflict novalidate