Branch two first commit
Modified file of branch one from branch two.
After merge file
After merge second
Merged