merge two branches : serial_dev, draw_dev