Testing branch first commit
Commit a different version for testing merging.
Commit for testing merging
Conflicting issue solved.