remove useless merge!