added ours and theirs git aliases