conflict in colamd.h resolved