minor edits
fixing conflicts