fix broken.
reddit support
fix merge conflict