new form style added
conflict fixed