fixed merge conflict
Merge pull request #120 from ballauriena/x_button

fixed merge conflict