Added assume and ours/theirs to git config