use diff3 for conflicts
Always rebase instead of merge on pull