merged versions