added onClick and conflict state