fixing links and question markup
fixing conflicts