added partners, members, postdoc
changed filenames
conflist resolution