Add attribute in branch two
Merge branch '2'