new branch created -'testing'
checking merging
Resolving merge
testing merge
merging
merging testing
merging testing 3
merging testing 4
Understanding conflicts done.
Understanding conflicts done.
Understanding conflicts done.
Understanding conflicts done.