Issue 265 conflicts and documentation