merge latest liquid changes