Added check for conflicts when submitting form