added repositories section
resolving conflicts