MQM features conflict resolved