Occasionally I’ll get hit with a few unwieldy conflicts. Usually it’s one or two lines, and always a whitespace issue because someone’s code style just has to be different.