documenting output format
resolving conflicts