some stuff ...
merging