merge w. bjorn