forms conflict fix and submit success message