trac responses to flagged message replies
fixing conflicts