add uibutton
resolve conflict