article gone togglable
merging & resolving conflicts