my_repo Repo made for exercise Adding different line here! Now adding new line here. We are resolving a conflict now! ...and again Making changes again to examine the branch dev GitBash test not change