If there is a conflict, then the M1 control does not match what is in the ELKRP data base.
1. Try downloading the values from ELKRP again.
2. Change the settings in the Sunrise/sunset, then change them back to what you want. This could fix any garbage values that might have got into the data base in ELKRP.
3. Upload the values in the control to ELKRP.