repair incollection acceptance tests
acceptance tests for editing references
fix conflict