conflcts.rs: label conflict markers with conflict #, side #, whether it's a side or a diff

conflcts.rs: label conflict markers with conflict #, side #, whether it's a side or a diff #6863