# Conflicts: # BeWo/ServiceProxy/Generated.cs # Data/Access/SearchDAO.cs -> Generated neu generiert -> SearchDAO behoben