With dailyrecord
Conflicts Resolved