fix the extra conflict
enhance dashboard