fixed links and question creation
resolved conflicts