Updated: Exelon, DC mayor reach settlement on Pepco merger