Added vulgarity
Fixed merge conflicts