twiter client is configured
resolving merge conflict