finish whohasmaker, datamaker, pkgmaker
conflict sovled