Change tipthegeeks description
Fixed merge conflict