comment:subo merge fixed