Add getBranches() and getTags() methods to Repo
Conflict resolution