Conflicts resolved on AdDAO