Conflicts resolved

Integration previously integrated to pmc.