undo pull
some conf changes
first post