Merge 'lola'