April 4 merge