observation grid and documents
conflicts resolved