fix inverted button
fixed merge conflict