Added class button
Merge