add howdoi
resolve conflict