merge with grbl edge