Merge pull request #819 from Windower/4.1

Updated missing conflicting values