Issue 184 conflicts and documentation