-added Risiko: Privatssphaere (Ready fpr reedit)
-conflict resolve