button conflict

updated a button conflict