added attribute "slave"
introduced mergebug2
created a class with no attributes
added attribute class1::master to branch master