remove merge code