make MAKEALL more immune to merge conflicts