Comment out pull rebase = true
Change diff/merge tool sourcetree to p4merge