charger
edit sedikit
merge manual