revise suggested tweet
resolve conflict
fix tracking?