Attempting to resolve conflicts
Adding bagtree if not in repo