oct 18 merge test