added twitter gem
fixed conflits