add tone of voice crud
resolve conflicts