changed my button's name
conflict resolution