change configuration for user rights
fix conflict errors