Fix issues created by SourceTree
Merge