testing confict in master1