remove merge code..