merge repos
resolves merge conflicts