mail settings for props
conflicts removed