simple docstrings for conflicts.py
remove conflicts function

never used