uncommented merge test