Points and conflicts

Added in points and conflicts