git conflicts
Fixing git conflicts ...
Version 1.2; Fixed git conflicts