fixed remove
fixed mergingissues