Added tweet display limit
Repaired conflict