added list of edailys
added list of edailys
fixed conflict