Adding button class
Resolving conflicts