Rewrite dialog service, looks beautiful
Fix conflict