Welcome to ERPNext!
One option to overcome a merge conflict is to try this Broken after bench update - #3 by hrwx