Added test that is needed when merging models from the Annex60 library.
Resolved conflict.