fixed merge issue of two edit buttons