added back example config after fixing conflicts