merge de adri/alaric