minori fixes rep
risolvo conflitti
fix cookie