change in pm conf
merging conflict with myself