dpshelio changes and merge conflicts resolve