merge conflict in _history.html.slim