merger test updated