Can you rebase this to fix the merge conflict and then can someone review it?

View Change

To view, visit change 35561. To unsubscribe, or for help writing mail filters, visit settings.