more merge fixes and persist the actual values that caused an alert