Martin Kepplinger merge