added form, show for updates
updates almost finished
conflict solution