Use diff3 style for git merges