resolved m conflict