address Aaron's comments
resolve conflicts