Auto-merging math/py-ndcurves/MakefileCONFLICT (content): Merge conflict in math/py-ndcurves/MakefileAuto-merging math/ndcurves/distinfoCONFLICT (content): Merge conflict in math/ndcurves/distinfoAuto-merging math/ndcurves/MakefileCONFLICT (content): Merge conflict in math/ndcurves/MakefileAutomatic merge failed; fix conflicts and then commit the result.Cleaning up project directory and file based variablesERROR: Job failed: exit code 1