adding bonjour
merging