garden war merge