remove merge stuff