merge Martin Kepplinger-Novakovic