hide messages on davidgvine
resolve conflicts