fixed format of conflict submission