resolved conflict
added references and some text, to be adjusted and set in context...