Version 1
Version 2
Merge origin/master