changes to check m conflicts