Message properties conflits resolved