merge fix
another merge fix
fixed emoji and tweet displaying
merge conflict