Merge issue
Officially fixed version of git