before pull
merged
80 column limit, remove redundant lines