ask for passwords for system files
fix merge conflicts