fix -- remove merge tag