Fixed lab2m conflict