modalist conflict fixed