merge w bjorn