button action finished
conflict fixed