added a button
Fixed conflict